More INTERVAL fixes.