Add some changes I had lying around