Some more tweaks to loading the database