Fix a couple of issues.  Nice catch Larry.