Fix up some stacks and messages