WIP more build_type fixes