Merge branch 'alexis/various-fixes' into wip