fixing some order stuff for ubuntu 10.04

Maybe you're right, I'm going to merge this as a temporary fix.
Please squash this into one commit (without the force_unlink fix) as suggested, so I can revert it easily once 10.04 support is dropped in 2015.