Commit some changes I had lying around