Fixed Angular issues