Oak Index Manager - Oak-detection, minor cleanups