Fix mistyping issues