[MOD] Some minor changes.