Fixed errors found in last revision