Minor updates to prefix mapping