F360 - minor changes