preload fix and analytics fix