Fixes for 12/10/2014