Minor doc fixes

Thanks @msssk for finding the issues in the OnDemand docs
Merge branch 'master' into dev-0.4