#93 - Related fixes and improvements.