Fixed few bugs not allowing the CMS to load properly