Modifications to cleanup, etc.