simple fixes to stupid recently introduced bugs