some fixesx