Bug fixes in Contextualization steps