Bug Fixes on GUI and mode=noserver