Cleanup, crash fix