[MOD/FIX] A few issues.