Fix things complained about in last commit