HD4000/Capri Fixes