Fixes for 234,241,251,258 and travis issue

Now also fixed the travis issue.