Fix/suppress warnings