Fix build errors

These are remnants of recent merge.