Fixed last issues