Mobile fixes. Closes #18