Changes to allow compilation. WIP.
Compiler fixes.