Header Marker Fix

Ad hoc; fixed issues