Last bugs fixing