A few fixes for the last commit