Minor changes

Test the commit and get ready for fork.