Bug fixes for blocked version.