Merge corrections to GUI child branch