Pickle Barrel fixes for Nov. 14 core update