Copy from master fixes for warning