Fixed compilation erros