Fixing 2 issues