Minor bugfix and change to TechDivision_Storage package