Less bugs fixed