Misc tweaks to pass Theme Check