Port fixes for mixins.
Fix for URLs.