Bug fixes

Killed some bugs so the compiler would work.