Couple bug fixes

Is there a corresponding compiler flag? I think we can just disable it for the whole file.