various tweaks of no significance