#557 pcss fixes