Fixed some, not all, initial compilation issues