Fix loader related issues.