DB Roadkill fixes