moar mobile fixes