Changes to allow compilation. WIP.