Minor productivity changes.