Fixed a few issues with missing ordering.