Changes to make library buildable