FIX: Minor fixes [ci skip]