More fixes for POD