Warnings about unused variables fix