Fixes, kill, and bury #857