Some compilation erros fixed