Fix couple issues with Logic errors.