Patching up to current standard

Fingers crossed....