Fixes 12/17/14