One or two smaller fixes