Fixing compile errors. Still WIP.