fix build issues, codestyle