Bugfixes - angular 1.2.3 compatibility issues