Minor clean-up for push to staging...