Small changes for new admin theme compatibility