Legacy fixes to legacy loader and legacy browsers