more scratch-ws fixes