Parameter tweaks (and ugly but effective hacks