Addressed other issues by Peter and Erik.