(Librero) Some optimizations