Fixed two more problems with the last commit