Fixed media render thumb event and some cleanup