Updated deps and fixed related errors (except speclj)