Small improvements to pass Theme Check validation