Fix errors and warnings from the previous two commits