Cleanup + crash fix