ref architecture fixes