global: various fixes