Fixed some errors so it builds again.