Fix last know bugs