Fix bugs in baseline