Fix bugs and change implementation details of PdoDataMapper slightly