Changes to make library compile on its own