Fixes for PHP Types