More 1.8 updates

I'll be adding additional 1.8 updates to this branch if you want to pull them in. This is just a start.