Bug fixing KBO & NPB