Improved hiding of some extras