fixes in some funcs