some more resource + db wait fix