Couple minor fixes to render things more generic.

Joshua