minor order and include fix