More damage control.
Last fixes.