smaller fixes
smaller fixes