[FOLD] Fixes