standard build, small fixes