Fixes of last commit