fixes for forced build