Merge branch 'fixes' into 'master'

This applies some fixes which should go into the pseudo-public version.