Fxing small issues.