Issue 57 fixes