Better fixup commands
Merged modifications