Couple o fixes