Fix some issues with the Preloader by avoiding lazy eval