more fixes on the real device