Squash: updates for @uGoMobi comments