Fix small name and type errors