Bug fixes, migration for voltrondev