GUI and FBA corrections