Fixed Production Bugs Prior to Live

Fixed Production Bugs Prior to Live