[MOD] Minor changes