Apply small fixes

I forgot two small things in my last commit