further improvements towards mobile support