Updates to work with latest Angular bits.