Fixes in demo and trial GUIs