Couple of quick fixes