Some fixes (see changelog)

Some fixes (see changelog). Feel free to use those of them that make sense to you.