Fix issues with options and the Numbers tool