Minor dep updates (mainly rOCCI-core from master)