various fix
various fix