extensions tidy up and fix compile errors

There are more