Some fixes

More info in commits. Check the multibuy commit to make sure that seems a good enough fix.