Bug fixes for round three.