Fixed Bugs for First Production

Fixed Bugs for First Production