fix micro bugs