Admin overrides fixes for 1.3 - I realise this is now in the wrong branch. Will be moving to 1-3-fixes shortly.