Improvements to make phpstorm happier