more teeny fixes