GUI stability fixes