Debian fixes

These two fixes make muffin compile and work on Debian Testing.