202 fixes to small bugs