Slow Drain Fixes