A few other fixes

More info [here](https://bountify.co/simple-wordpress-theme-function-php-bug#comment-3313)