Fixes for #KGO-497
Fixes for #KGO-497

wesley1001/Kurogo-Mobile-Web,wesley1001/Kurogo-Mobile-Web,modolabs/Kurogo-Mobile-Web,modolabs/Kurogo-Mobile-Web,modolabs/Kurogo-Mobile-Web,wesley1001/Kurogo-Mobile-Web