Fixing 2 other bugs (see Bugtracker)