Fixed a few bugs that were blocking compilation