Further accessible fixes (global)