Caught some load-order bugs