CK patchset

Signed-off-by: Evan Anderson <evan@thelinuxman.us>