Fixed various bugs with new object adding feature