Temporary fix to silence a few warnings.

Need to revisit this.