Fix a couple ng-repeat related issues