Forgot to attach the patch with the minor fixes.. here it is.

- Frank