Fix for #193

This is just a quick fix to get `psci` working again.
The rest of the changes should be in their own issues.