Fixing dev branch issues