AWAKE: Several issues have been fixed.

Several issues have been fixed.