Fixing resource orders and other small parts