Fix more Warnings