Minor revision

Minor changes to code for binary distribution.