Fixes for code-changes.