Eliminated reorder warnings