Updates to 83ed21c (Dec 2nd)