correct some typing issues