Fixes for package imports in generated client code.