Fix last issues