Bugfix in aliases and small update