Support for angular 1.2.x: more fixes