Fix some problems with the last commit