Some fixes and disabled WimaxButton