CS Fixes
Some fixes after the last refactoring
Merge pull request #1818 from aRn0D/fix/bundle-class

Some fixes after the last refactoring