Fixed some impossible bugs...