Merge branch 'some-fixes'