smaller fixes