[46325/46530] Crash fixes