Fixes for Angular 0.11.0