Minor problem fixes in addition to Kevin's fix on 19) and 20).