Various polishing for live image build