Compilation Fixes