#28 Fixed some issues when upgrading from 0.8.2 to this (what will be 0.8.3)