Fixes for broken SSH