Fix minor issues pointed out by bska.