Fix some things for compile on cray

Conflicts:
	Mara/boundary.cpp