Bugfixes and shortcodes