Minor changes related to prefix