Some small fixes

:bowtie: