tweaks for 0.4