Fix POD errors