Fix/mute couple compiler warnings