Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r468725568ea6d9226934e2251f7080b167de2c5a -ra3deb82a03e36c10d0c47c20382ce4275fef58c4
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 468725568ea6d9226934e2251f7080b167de2c5a)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision a3deb82a03e36c10d0c47c20382ce4275fef58c4)
@@ -372,8 +372,8 @@
 	branching : function(x, y) {
 		if (x == undefined || y == undefined) {
 			// just redraw the activity
-			x = this.items.shape.getBBox().x;
-			y = this.items.shape.getBBox().y;
+			x = this.items.getBBox().x;
+			y = this.items.getBBox().y;
 		}
 		
 		if (this.items) {
@@ -655,8 +655,8 @@
 	tool : function(x, y) {
 		if (x == undefined || y == undefined) {
 			// if no new coordinates are given, just redraw the activity
-			x = this.items.shape.getBBox().x;
-			y = this.items.shape.getBBox().y;
+			x = this.items.getBBox().x;
+			y = this.items.getBBox().y;
 		}
 		
 		if (this.items) {
@@ -1356,8 +1356,8 @@
 	 * Calculates start, middle and end points of a line between two activities. 
 	 */
 	findTransitionPoints : function(fromActivity, toActivity) {
-		var fromActivityBox = fromActivity.items.shape.getBBox(),
-			toActivityBox = toActivity.items.shape.getBBox(),
+		var fromActivityBox = fromActivity.items.getBBox(),
+			toActivityBox = toActivity.items.getBBox(),
 			horizontalDelta = Math.abs(fromActivityBox.cx - toActivityBox.cx),
 			verticalDelta = Math.abs(fromActivityBox.cy - toActivityBox.cy),
 			// if the box is more up/down then left/right, then arrow direction is vertical
Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra3deb82a03e36c10d0c47c20382ce4275fef58c4
--- lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision a3deb82a03e36c10d0c47c20382ce4275fef58c4)
@@ -204,7 +204,7 @@
 			object.draw();
 		} else {
 			// finialise the drop
-			var box = object.items.shape.getBBox(),
+			var box = object.items.getBBox(),
 				originalCoordinates = {
 					x : box.x,
 					// adjust this coordinate for annotation labels