Resolve last issues