CS Fixes
Adding some adjustments
Merge pull request #1819 from aRn0D/csfix/load

CS Fixes