Minor changes in module order