fixed compilation erros from last commit