Fixes for yesterday's pull