fix some issues with _WAK