BLK-226 fix patching

Also fixed minor issue with wrong object name (carry over from another merge)