main/musl: additional fixes