Prepare for PDO and undumb comments