more sporadic fixes