Angular bug fixes