Fix several bugs related to the Scientific migration