Fixes for travis building and merge changes from akbargumbira