Update angular and fix