Some more fixes before ending tonight's session..