Tweaks for Guillimin environment.