Some fixes (see changelog.txt)