Added Christian's fixes.