Android: - Fixed some Moonraker mapping issues - Fixed some crashes iOS: - Fixed some Moonraker mapping issues