Couple more build type check changes originally missed.