Fixing psr errors