Vanilla fixes Oct 16

@hippee-lee 

Minor updates