Some PSR camellias fixes