Fix some errors discovered.