Fixed PSSC, other minor changes