Development - Fixes from 9/15/14