Fix couple bugs @qadan found in QAland.