HbbTV Fixed Compilation