Missing bits from my local angular

@steder These should piggyback in as well.