Misc improvements.
Merge remote-tracking branch 'origin/angular-server' into angular-server