Issue 3 fixes