Fixed dumb heap/queue mistakes