Shane's quick fixes to some bugs