Minor changes to define-library