Merge pull request #640 from dmitryilyin/savanna_fixes

Remove OS restrictions from savanna
More savanna fixes