Fix byte run setting and null-guard usage