Fix last data type and casting compiler nuisances