some fixes

fix #408