Fix assertion
Fix requestId -> messageId
Allow ids to be strings or numbers