Fixed up a couple more files