Fix some build modes