CS Fixes
Some fixes after the last refactoring
Adding some adjustments
Merge pull request #1819 from aRn0D/csfix/load

CS Fixes
Merge pull request #1818 from aRn0D/fix/bundle-class

Some fixes after the last refactoring