MOAR derp fixes.