smaller fixes;