My local modifications to lugagge.make