Fixed some freezes at launch