Fixing compile erros