Fixes, fixed last couple of bugs after refactoring for branded
directories