More baseline fixes