Fix errors from last checkin