Fixing some architecture