Minor changes to finalize #49