Coverups/cleanups

C