some architecture fixes