Fixes for angular refactor.