More performance fixes (release mode configured aswell)