* Nasty hacks to fix initial DB import