fix small bugs from last couple patches