Some Fixes
Merge pull request #947 from DaviRyan/SomeFixes

Some Fixes