Fixed to small type bugs