Minor couple of fixes related to ordering