A couple of quick fixes