Fields properties and other minor changes