Fix Angular issues