fixes for issues of stuffs