Various lisibility improvements