Warnings

Fix more warnings on Mac