Fixes to inchlib