Upgrade && bugfixes