Quick changes to get things workinga  little nicer.