Minor cleanup in preperation for regression testing