Some fixes (i don't remember nuu)