Some changes to inliner