More loader improvements