[Warnings] Fix -Wreorder and -Wunused warnings recently introduced