A bunch o fixes