Fixes for #14 & #15.