A few tiny fixes