Fix various errors from prev changes