Futher tweaks to ensure that the a Database is available at time of installation