Fixed minor questions problems