Christian's fixes