Last bugs fixed