Issue/auto closing literals

Two small bugfixes.