Fixes to f8c3f11