Fixed several bugs with the last commit.