Small updates for my own use