Muffin can be build

Forget pull request 1. This one is better. Muffin builds now fine on Warden.