Pods architecture build tweaks.