Fixed some problems with the last commit