Bug fixes and POD update