Fix and minor changes