Tweaks to support admin theme