Replace the offending argument earlier in the boot process thx Wanam (more changes)