Fixes for accessory margins