Fixed 3 issues