Rotom Fixes and crash fixes