Fix for '0' strings, because PHP
(Minor tweaks)