misc: Minor fixes