Bug fixes for 232fa8. Updated to version 180.