Collection of KMS fixes

[Jesse B. <jb...@vi...>]

Here's a collection of KMS fixes I've put together over the past few days.