Update for 1.5+

Also clean up some stacks