Multiple Q fixes