Minor reorderings