Fixes for PHP warnings and shortcode editor improvements.