More Num optimizations