Reslove issues raised by Joel and Gedare at the thread on the devel mailing list