Flutter Bug Fixes by Mimi Khan