bug fixes, see Changelog