Fixed Compilation Erros