Minor changes and repack