some minor bug/warning fixed