Fixes for tests and parsing/computing of offsets and labels.