Some more final touches for PHP