Tweaks to the angular branch