fixed compile errors
fixed compile erros from pull