Fixes for Early Augest 2014