Some changes for nancyfx