Fixed load order and error messages