Fixes in multiple places.