Minor reordering