Bug fixes for issues found when pushed to dev