Hanan's fixes.