Some small fixes :bowtie: