adjustments for conventions 1.0.1