Bug fixes based upon code review