lv2 phase 2 fixups