correct some issues