couple more type mismatches fixed