Fixes related to changed path (dammed phpstorm refactoring)