Fixed some sope issues.