Fixes, upgrades