Initial fixes to compile correctly.