Fix some order dependencies in specs