Repairs stage 2

Repairs stage two