Fixes and improvements from opml testing