Work on some version file issues