More small fixes for build restrictions