architecture fixes