Fixes of all kind