more mobile fixes, can't do local testing right now