Fix minor questions problems