Fixed up some issues with pre-load.