Navigation 2.1.8

	* Updated some minor things to keep up to date with Core 2.5.7