[Code/GUI] Minor fixes.