Fixed some error that had crept in