Fixes for last change set.