fixes for dec 20 release