FIX: more outstanding fixes