[TODO] Minor changes