Fixed library errors with v7