Fixed comple of small code errors that crept in.