Fixes to input libraries