[0.2] Minor changes