Prepaint patching

Repairs under way