Fix 21day bugs