more minor fixes
fixes