fixture: Minor fixes