Bugfixes and V upgrades