Fixing angular issues