V7 stable global fixes