Some changes and repack assets