Fix compile errors

This fixes all compile errors.
All commits must compile!