small fixes for build