[MOD] Fixing problems