Merge remote-tracking branch 'stevee/fixes'