Fixing some library referencing