Fix and improve various small things