Loader changes & optimizations related to issue #2551