Remove a crash, some other small things