Issue 323 fixes