Qual: Fix two awful code with hardcoded values. This remove also 2 TODO.