Fixes for PHP enjoyeability