Fixing all known POD failures