Added some more to make icc compiler happy.
Hopefully spike_pipe will work now.