Merge branch 'various-fixes' into next