Little various changes