Fix types + some mobile improvements