Upgrade SAM version, fixed couple of baseUrl vars