Two fixes for broken packages

The git-annex one still needs more work, but I think this change is a step in the right direction.