More fuck up fixes.