A few corrections to the portable code
Merge branch 'master' of https://github.com/nradulovic/meerkat