multiple tiny fixes