Support: corrected some functions