Fix loader issues