Merge fixes from unclecheese into own