Merged in "minor bug fixes" from Josh