Extensions fixes for multi domain compatibility