minor modification in MainActivity and WbUtil