Small fixes for the last commit