Some changes to ensure code runs on biox3