And moarrr fixes.. now with moar fixes.