Correct possible bugs (compiller warnings)