Critical bugs fixed