Fixes and upgrades
