Fix -Dall, closes #512