Buildable master

Hi Yanick. I expected this pull request to only contain the pod fixes and not stuff I've already sent you. Hope you can work it out and tell me what I'm doing wrong.