Bug fixes
Tested on device