More tiny fixes