More small in anger fixes.