Known bugs fixed