Some changes to building and packaging