more smaller fixes