Fixes of things