Some commits from k9krew