Scraper fixes. NHibernate mapping fixes.