fix errors from previous two commits