Further fixes to lv5