Cosmetic + bug fix attemp. Will be validated later.