Awaken: Increase the handle adaptation and repair some BUGs.

Increase the handle adaptation and repair some BUGs.