Compilation erros fixed