Nitrate fixes