Fixes for Extraview 10008, 10010, 10022, 10053, 10055, 10061