Fix last things