Fix system types