Updates for advection example

This fixed quite a few issues before we can get the advection demo working.