more type mismatch warning fixes