Updates to 6ffbf3a (Nov 22nd)