Fixed build erros