Correct some issues
Merge pull request #3 from cbonnissent/1.1_3650

Correct some issues