more fixes for 0.4-5 (see Changelog)