few tiny fixes