[0708] Fixed remaining errors from previous commits