More mobile fixes

Signed-off-by: Guillaume Clement <gclement@baobob.org>