Fixes for shortest cycle uniqueness