Mobile fixes for issues #46 and #47.