Some mimor changes