A few bug-fixes needed in GUI