Fixed ng-grid issues etc.