Fix some variables accesses.