Some fixes to baseline functions