DB population & prime final fix