Fixes for PHP Editor (in progress...)