Merge "Fixes for a couple of strict mode violations."