Fixes to issues #1 & #2.