UAC1 skip/insert code tweaks