Commit merge fix-ups