Fixes and sync with desktop version