Implement Kelley's fixes