Fix notices and a bit cleanup

Fixed 2 notices.
Because I develop with `define(WP_DEBUG, true);` in my `wp-config.php`.