Fixed more mobile issues