[General] More fixes

PHP is literally worse than Hitler