More swchook fixes