more obvious fixes