Load Analytics async + other minor changes