Merge branch 'fixes' into for-next