Fixed minor bugs in system2 and system3