Forgot to commit these fixes/updates yesterday.