Bunch o fixes