Fix some junk