Small PSR fixes and old pending commits