Fix compiler errors on VS2013
Forward submodule