Fixes on rest Click and ws deps