Fixed 2 Issues