master: f54e67946f3296761318c1cb9ff49d6284725344 More fixes