diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 48160f41702..ba4693cbfbe 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -507,7 +507,7 @@ public class VolumeServiceImpl implements VolumeService {
 
         try {
         	DataObject volumeOnStore = store.create(volume);
-        	volume.processEvent(Event.CreateOnlyRequested);
+        	volumeOnStore.processEvent(Event.CreateOnlyRequested);
         	snapshot.processEvent(Event.CopyingRequested);
         	 CreateVolumeFromBaseImageContext<VolumeApiResult> context = new CreateVolumeFromBaseImageContext<VolumeApiResult>(null,
         			 volume, store, volumeOnStore, future, snapshot);
@@ -528,7 +528,7 @@ public class VolumeServiceImpl implements VolumeService {
     protected Void createVolumeFromSnapshotCallback(AsyncCallbackDispatcher<VolumeServiceImpl, CopyCommandResult> callback,
     		CreateVolumeFromBaseImageContext<VolumeApiResult> context) {
     	CopyCommandResult result = callback.getResult();
-    	VolumeInfo volume = (VolumeInfo)context.vo;
+    	VolumeInfo volume = (VolumeInfo)context.templateOnStore;
     	SnapshotInfo snapshot = context.snapshot;
     	VolumeApiResult apiResult = new VolumeApiResult(volume);
     	Event event = null;
diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
index 8a67e84f951..bddf713e3a8 100644
--- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
+++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
@@ -46,7 +46,7 @@ import com.cloud.vm.dao.DomainRouterDao;
 @Configuration
 @ComponentScan(
     basePackageClasses={
-            NetUtils.class,
+            NetUtils.class
     },
     includeFilters={@Filter(value=ElementChildTestConfiguration.Library.class, type=FilterType.CUSTOM)},
     useDefaultFilters=false
diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
index 74e54b23295..4f03b27b013 100644
--- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
+++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
@@ -56,7 +56,7 @@ import com.cloud.user.dao.AccountDao;
 @Configuration
 @ComponentScan(
     basePackageClasses={
-            NetUtils.class,
+            NetUtils.class
     },
     includeFilters={@Filter(value=LbChildTestConfiguration.Library.class, type=FilterType.CUSTOM)},
     useDefaultFilters=false