- Fix some minor changes