Fixed Mik's build issues.