A couple a quick fixes