More flimflam tweaks