Fix setting of current profile and catalog