Fixes for Azure PS 0.8.3 and Express 4.0