US-16: Corrected some previous bugs.