Fix stupid stuff