Typos and order consistency fixes