POD coverage fixes, version 0.02