more fixes for #429