Fixed 2 issues