Merge branch 'mdw/fixes'