Working on removing compilation bugs