Fix bugs mentioned from "Krywult David" (tgi forums)