Further fixes for underclock