small fixes

especially for #544