Updated fixes for #2012.