Bug fixes where the default variables don't show up any more!