Some final things fixed