Fixes to run on sauron