Small fixes in GUI version.