Fixed crash when no extra buttons.
Warning related fixes.