Merge Michael (partial) & fixup