NNV-113 & NHV-125

https://nhibernate.jira.com/browse/NHV-113
https://nhibernate.jira.com/browse/NHV-125