Fixing performances and crashes issues