Fix Loader/CLoader issues.