Couple of changes to build on arch linux