Fixes as of 9/9/2014