fixes #1783
fixes #1723
fixes #1785
fixes #1807
Merge pull request #1809 from state-hiu/easy_fixes_20141119

Easy Fixes, Batch 1