More psr fixes for full model