Updates/fixes to wak through