Fixes

Two small tweaks.  The first fixes an error that shows up with C++11.  The second adds some helpful constructors.