* Correct some warnigns