WIP - build_type fix