small fixes to build #2