Fixing some stacking issues.