some other fixes.