Final changes to accelerators before merge with post-0.9