Fork with fixes for issues discovered, etc.