Minor updates for running under PCF