Imprv/fix compiler warnings