Fix some edge case bugs with instrument versioning