Fix .system paths in a couple of places.

Ticket:	#6374