merged in Instance Fix from @juliangruber for WS init.