Fix possibly errors