Smaller changes and fixes