Fixes for change requests.