Fixed more foolish things