A few fixes for the optimizations -- Brad, you're too fast!