Make some classes sealed and other cleanup.