fixes

Following a mildly disastrous test run