Misc updates to enable layerEdit and customerRetrieve