Small cleanup of fallout from build switch over