Fixed some stack issues.