Hotfix: some short tags in core classes