Minor fixes/revisions