Fixes on the previous commit