Bunch o fixes.