Minor adjustments to the rest of psari