Minor changes (v1.6)