Updated submodule
Fixed some deriver bugs