Trivial fixes to compile in release mode.