Nice catches, will update these soon