Less warnings in lib