Update, fix build rules for -j