Fixes for psc 0.6.1